From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752006AbcAVCGr (ORCPT ); Thu, 21 Jan 2016 21:06:47 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:49697 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007AbcAVCGl (ORCPT ); Thu, 21 Jan 2016 21:06:41 -0500 X-AuditID: cbfee690-f79646d000001316-f3-56a18eae457c Message-id: <56A18EAE.6030900@samsung.com> Date: Fri, 22 Jan 2016 11:06:38 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-version: 1.0 To: Shawn Lin , Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] mmc: dw_mmc: remove DW_MCI_QUIRK_BROKEN_CARD_DETECTION quirk References: <1453359172-5977-1-git-send-email-shawn.lin@rock-chips.com> In-reply-to: <1453359172-5977-1-git-send-email-shawn.lin@rock-chips.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeLIzCtJLcpLzFFi42JZI2JSoruub2GYweY9ZhaXd81hszjyv5/R 4s6T9awWx9eGO7B43Lm2h83j76z9LB6fN8kFMEdx2aSk5mSWpRbp2yVwZSy59Z2p4L58xclt f9gbGLsluxg5OSQETCQm/u9hhbDFJC7cW88GYgsJrGCUuHO5GKZm074NrBDxWYwS2+7GdTFy AdkPGCV2zjkP1sAroCXxfsED5i5GDg4WAVWJna0VIGE2AR2J7d+OM4HYogJhEg/W7WWFKBeU +DH5HguILSLgJ7F1x1awMcwC1hI/f7SC1QgD1d+4NJ0FYq+7xO9fC5hBbE4BD4nrkxcygaxi FtCTuH9RC6JVXmLzmrfMIKdJCKxil3hzfAlYPYuAgMS3yYdYQOolBGQlNh1ghnhLUuLgihss ExjFZiG5aBbC1FlIpi5gZF7FKJpakFxQnJReZKJXnJhbXJqXrpecn7uJERg7p/89m7CD8d4B 60OMAhyMSjy8HLoLw4RYE8uKK3MPMZoCHTGRWUo0OR8YoXkl8YbGZkYWpiamxkbmlmZK4ryv pX4GCwmkJ5akZqemFqQWxReV5qQWH2Jk4uCUamCMMtVOnBDTV3b1qs3uyJOeb42O/VBYMvWn 2yL5Sjte6Z6L7E8nJzjsM42btWCz1CmpSiHLa4xuE+Kn/9BbY2SwW1jlc9HlWVGx22W3zqwr n1dlssb19K5fJefe/1bK2Xjjbmjb7VVOZ6ZZH9Z/12Oo84Ov54fBFd873AH/+X7K8e+smXLo gIGlEktxRqKhFnNRcSIAloD2rZgCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMIsWRmVeSWpSXmKPExsVy+t9jQd11fQvDDO7u17O4vGsOm8WR//2M FneerGe1OL423IHF4861PWwef2ftZ/H4vEkugDmqgdEmIzUxJbVIITUvOT8lMy/dVsk7ON45 3tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB2ibkkJZYk4pUCggsbhYSd8O04TQEDddC5jGCF3f kCC4HiMDNJCwhjFjya3vTAX35StObvvD3sDYLdnFyMkhIWAisWnfBlYIW0ziwr31bCC2kMAs Roltd+O6GLmA7AeMEjvnnAdL8ApoSbxf8IC5i5GDg0VAVWJnawVImE1AR2L7t+NMILaoQJjE g3V7WSHKBSV+TL7HAmKLCPhJbN2xFWwMs4C1xM8frWA1wkD1Ny5NZ4HY6y7x+9cCZhCbU8BD 4vrkhUwgq5gF9CTuX9SCaJWX2LzmLfMERqAbETbMQqiahaRqASPzKkaJ1ILkguKk9FyjvNRy veLE3OLSvHS95PzcTYzgCH0mvYPx8C73Q4wCHIxKPLwcugvDhFgTy4orcw8xSnAwK4nwbq0G CvGmJFZWpRblxxeV5qQWH2I0BYbARGYp0eR8YPLIK4k3NDYxM7I0Mje0MDI2VxLn3XcpMkxI ID2xJDU7NbUgtQimj4mDU6qBUajA52v1zOW1aqECvQ8mqlVclvgWamQnZL9r922bBxd8ahdV OvP+/Lz2QUR735E7R+NyN7+PYrK3+S2y1HXVPovQI2evCZ7rVYtb+/ScjZLkxadVkz9u3RjN siGtsvBOU1bCvo1OO5v3cdvNW9JpKLDPrdux8dTS77usJsjyRktLF9ZF/Li0SYmlOCPRUIu5 qDgRALxl6yXmAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Shawn. On 01/21/2016 03:52 PM, Shawn Lin wrote: > dw_mmc already use mmc_of_parse to get "broken-cd" property, > but it considered "broken-cd" to be a quirk in its driver. We > don't need this quirk here, and just take what we need from > mmc->caps. I have reverted the previous version, this version looks good to me. I will apply this. With Exynos SoCs, Tested-by: Jaehoon Chung Best Regards, Jaehoon Chung > > Signed-off-by: Shawn Lin > > --- > > Changes in v2: > - fix wrong using of cur_slot > > drivers/mmc/host/dw_mmc.c | 35 ++++++++++------------------------- > include/linux/mmc/dw_mmc.h | 4 +--- > 2 files changed, 11 insertions(+), 28 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 7128351..96f173b 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -1450,12 +1450,11 @@ static int dw_mci_get_cd(struct mmc_host *mmc) > { > int present; > struct dw_mci_slot *slot = mmc_priv(mmc); > - struct dw_mci_board *brd = slot->host->pdata; > struct dw_mci *host = slot->host; > int gpio_cd = mmc_gpio_get_cd(mmc); > > /* Use platform get_cd function, else try onboard card detect */ > - if ((brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) || > + if ((mmc->caps & MMC_CAP_NEEDS_POLL) || > (mmc->caps & MMC_CAP_NONREMOVABLE)) > present = 1; > else if (!IS_ERR_VALUE(gpio_cd)) > @@ -2840,23 +2839,13 @@ static void dw_mci_dto_timer(unsigned long arg) > } > > #ifdef CONFIG_OF > -static struct dw_mci_of_quirks { > - char *quirk; > - int id; > -} of_quirks[] = { > - { > - .quirk = "broken-cd", > - .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, > - }, > -}; > - > static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > { > struct dw_mci_board *pdata; > struct device *dev = host->dev; > struct device_node *np = dev->of_node; > const struct dw_mci_drv_data *drv_data = host->drv_data; > - int idx, ret; > + int ret; > u32 clock_frequency; > > pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); > @@ -2871,11 +2860,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > pdata->num_slots = 1; > } > > - /* get quirks */ > - for (idx = 0; idx < ARRAY_SIZE(of_quirks); idx++) > - if (of_get_property(np, of_quirks[idx].quirk, NULL)) > - pdata->quirks |= of_quirks[idx].id; > - > if (of_property_read_u32(np, "fifo-depth", &pdata->fifo_depth)) > dev_info(dev, > "fifo-depth property not found, using value of FIFOTH register as default\n"); > @@ -2908,18 +2892,19 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > > static void dw_mci_enable_cd(struct dw_mci *host) > { > - struct dw_mci_board *brd = host->pdata; > unsigned long irqflags; > u32 temp; > int i; > + struct dw_mci_slot *slot; > > - /* No need for CD if broken card detection */ > - if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) > - return; > - > - /* No need for CD if all slots have a non-error GPIO */ > + /* > + * No need for CD if all slots have a non-error GPIO > + * as well as broken card detection is found. > + */ > for (i = 0; i < host->num_slots; i++) { > - struct dw_mci_slot *slot = host->slot[i]; > + slot = host->slot[i]; > + if (slot->mmc->caps & MMC_CAP_NEEDS_POLL) > + return; > > if (IS_ERR_VALUE(mmc_gpio_get_cd(slot->mmc))) > break; > diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h > index 89df7ab..250d822 100644 > --- a/include/linux/mmc/dw_mmc.h > +++ b/include/linux/mmc/dw_mmc.h > @@ -235,10 +235,8 @@ struct dw_mci_dma_ops { > }; > > /* IP Quirks/flags. */ > -/* Unreliable card detection */ > -#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(0) > /* Timer for broken data transfer over scheme */ > -#define DW_MCI_QUIRK_BROKEN_DTO BIT(1) > +#define DW_MCI_QUIRK_BROKEN_DTO BIT(0) > > struct dma_pdata; > >